Revert 15471:7ac7f147241405af83e7a9d748cf7b01279734fc

Block-device specifiers in ioemu can contain colons, so skipping
always past the first colon is not a good idea. Better solutions are
in the pipeline to solve the blktap issues.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/ioemu/xenstore.c b/tools/ioemu/xenstore.c
index d711bba7b1a944b7249ffccf9712bcaa83036e43..ddadcb6a0fba32a5a75237c894c8247120f05cbd 100644 (file)
--- a/tools/ioemu/xenstore.c
+++ b/tools/ioemu/xenstore.c
@@ -173,12 +173,10 @@ void xenstore_parse_domain_config(int domid)
         }
         /* open device now if media present */
         if (params[0]) {
-            char *p = strchr(params, ':');
-            p = p ? p+1 : params; /* skip colon separator if present */
             if (bdrv_open(bs_table[hd_index + (is_scsi ? MAX_DISKS : 0)],
-                          p, 0 /* snapshot */) < 0)
+                          params, 0 /* snapshot */) < 0)
                 fprintf(stderr, "qemu: could not open hard disk image '%s'\n",
-                        p);
+                        params);
         }
     }